Coding style cleanup...