Cleanup and linting
Correct english