cosmetics, split long lines, remove useless braces, merge comments and if