Implemented code review suggestions
Finished code review fixes