moving metrics out into separate class; refactoring