code improvement for the previous change (/commit)