Some Refactoring changes