Refactoring + added 'hyperstats' output