Add explicit return statements