simplify code and fix advice ... in 24

fixes #45