[ch-2014-1] further improvements on code readability