Little refactoring