* Minor Refactoring