Homogenize whitespace use and indentation