Updated file after code review!