Fixed various whitespace and indentation issues