moar refactor