code clean up of debug prints etc