Some Refactoring...