refactor category a little