style changes
merged commit