Remove comments
Refactor category arel table behind method
Refactor conditions for category inclusion behind method