Refactored some processing metrics out for clarity
More fun with refactoring