Improved source code style.