Cleanup and linting