Coding style and other changes