further linting and readability