clean up and merge two code lines ...