Minor syntax  changes from code review