re #179 Code cleanup.