cleaning up to have cleaner render
much much faster now