Clean up Formatting and comments