Some style changes #2