A little bit more refactoring.