Fix comments and formatting