Small commit: code cleanup and addition of MetricsLite.