General cleanup. Removed some extraneous return statements.
Code cleanup. Removed errant semi-colon.