Fix whitespace, indentation