Cleaned up CategoriesModel.java - documentation is improved, removed some commented code