Slightly improved code quality.