some style changes
merged