Coding style changes

Not ready to be merged yet