- code cleanup from pull #31