removed explicit returns