moar refactoringz