more cleaning of the classes, still all working