minor code cleanup #95