Coding style cleanup/updates