Additional refactoring tweaks.

- Comment changes
- Prepend protected/private methods with an underscore
- Nix the conch