Fix, lint, readability