Coding style changes

Some more updates