Trivial cosmetic changes + cleanup.