Tidying up, linting, fixing brokenness.