minor cleanup, added todo 'thought' marks ...