Refactoring and Finalizing