Update returns to use parens, remove double new-lines between functions.
Code cleanup