Little refactoring went on