code cleanup per 2014-03-06 discussion @PR 356