Fix whitespace and indentation issues