quick fix and linting