#18 clean up work
that's weird