Some style changes
Some cleanup