Little bit of refactoring clean-up.