minor refactor in category