Minor Refactoring.