Code quality imprvments.