get rid of explicit returns