Fixing some bad code quality.