use instance of DS
cleanup code