Misc styling changes and cleanup.