* 1.4: minor code cleanup