redisign, comments improve