Fixed comments and formatting