Tidyness cleanup.  Also fixed the final return to not spam everything.