some tests, some styling, some simplifications