Changed code according to code review
Changed code according to code review

walshb/pyavroc,walshb/pyavroc,crs4/pyavroc,crs4/pyavroc,crs4/pyavroc,Byhiras/pyavroc,Byhiras/pyavroc,walshb/pyavroc,Byhiras/pyavroc,Byhiras/pyavroc,walshb/pyavroc