This specifies a more readable style with respect to the existing one. I'll reformat the code with the next commit.