Little refactoring..