same refactoring - ok
good - todo valgring and test
good tests - todo valgring