find a way to clean up some unnecessay metods and classed to make the code simpler