Use more explicit returns