Small style changes
merging...