:-o refactoring!