Refactor simplify

:thought_balloon: I was able to simplify some of the methods and delete some code.