clean up and tested warp class.