Add refactoring.
Fixed something