#86 Formatted KPIs, cleaning up JS