Refactoring
Fix refactoring