removed unnecessary returns
cleanup