linting and exceptions changed