fixed formatting and comments