Code cleanup, consistency on category availability (I assume it was lazy in creating...