Made syntax changes after code review