Finished up initial review of code