Fix metrics reporting

Also reduced nesting and indentation to help with the readability and changed some names and comments for consistency.
I think I would prefer not to, and keep finished exclusive to the finish event, it doesn't really change any other behavior either way as that's the only place we check for it.