removed stats
refactoring