remove explicit return variables where not needed