Just a bit 'o refactoring