minor changes
merged
style changes
merged