issue #37 - cleanup based on code review comments and new visual features.