Categories code review

Done!