cleanup/rewrite
one or two more things