Little Refactoring.