Some Refactoring