docstring
formatting
cleanup
shift into local and util ns
fix out of scope
move
fix ns