#10 minor code cleanup