Clean 1.5 code structure in categories model