cleaned some classes + started factory