fix metropolis renderer ; code cleanup