Starting a small refactoring..