linting for #541; old renderer code worst culprit and is mostly TODO