Finalize Refactoring..