Perform fixes and whitespace