Formatting and improved comments