Minor refactoring; category validation