all done. code is cleaned up.