some code cleanup (re #225)