Some small refactoring..