Re-factoring and Finalizing