Code quality wip.