A few tweaks to improve code quality.