cleaning up class methods to have more of a singular focus