A little bit more of refactoring went on