Cleanup

There should be no functional changes here. Instead I was just making CI easier with coverage and linting.