remove explicit return statements