Minor Refactoring
Minor Refactoring