add some explicit returns