small changes - removed unneccesary classes