Fix and homogenize indentation and use of whitespace