remove explicit return statements from functions