cleaned some classes/conversion to al