A little bit of refactoring performed.