Improved code quality a bit.