Starting to fix some code quality issues.