Fixing and linting