omg refactoring