minor cosmetic changes - gave up the big refactoring in fear of breaking
something