More progress been made
Class cleanup