Incremental imporvement is completed but not tested yet
Some cleanup