Some style changes, fix for pulling new changes