Completed code review and added suggestions.