Refactor as to not make the class look dumb