Fix whitespace and indentation