Changes to increase code quality.