Improved code style a bit.