Cleanup

Bunch of cosmetic changes.