Improved formatting and comments