GH51 - Modified after code review