Some Refactoring..