A few style changes
A few style changes