Clean up formatting and comments