Clean up formatting
Consistent naming in @name and @description fields