Cleaned up categories a bit