#44 Refactored the Category classes