Small refactoring and ready to compute simple stats