Finalizing the codebase