removed unneccesary layer of classes