- code cleanup for merge request #36