Fixed a few of the code review suggestions