Fixing attribute generator: removing comments, removing implementation details