minor code cleanup/consistency