--code improvement for release