Linting
Cleanup