Started refactoring of Target stat calculation methods