Finalizing Refactor.