MOAR refactoring'a