Redo class methods to not be tedious