Indentation and whitespace fixes