code cleanup and comment tweaking (issue #7)