Refactorin all day yo