style changes
few more style changes
merging