Upstream Sync

I went through the existing _s codebase and brought all of our code up to date with best practices.
Please review and let me know if you would like to remove any of these.