Minor Refactoring..