remove 'return' specification where logical to do so