Changes after code review and category implementation