Clean up formatting, maintain consistent style, remove whitespace