cleaned up category class