Cleanup public returns, and linting

I didn't clean up all of the lint errors; some of them didn't make sense to clean up. But all in all, it's much more in keeping with the Salt style guide.