Move return to bottom of function