cleanup and documentation
cleanup and documentation, cont.