Update some formatting to follow Java standards. Update Metrics code.