Some Style changes

Some Style changes