remove unnecessary returns