Cleanup based on linting