Semicolons on return statements, whitespace and explicit semicolons

Noticed missing semi-colons on return statements which evolved into editing for removal of whitespace and changing implicit semicolon usage to explicit semicolon usage.