cleanup
now with source code listings