removed unnecessary returns