Adds another category case
Main class code cleanup