linting
more tests
simplify