Finished the coding exercise