Minor stylistic cleanup