minor cleanup, still working in metrics