indentation and whitespace fixes