General stylistic cleanup