code improvement for previous change (/commit)