- Code cleanup. - Added metrics.