More stylistic cleanup