Finalizing code for review