Cleaned up some categories