Implemented Mass category & cleanup