General cleanups

Unified some naming conventions and made things more consistent overall. More specifically...
* use `make_shared` where appropriate
* made `for` loops consistant
* Added appropriate `const`.
* unified `s_` prefix for statics