Style fixes
Simplify a little