Some stylistic cleanup