[ch-2014-01] further improvements on code consistency