Updated formatting and comments