get rid of implicit returns