Minor Refactoring
Refactoring.