Little more refactoring