style changes
completing merge