Some coding style changes