Some spring cleaning.
Some more spring cleaning.
Some code style updates.
Some more code style updates.
Some more code style changes.