Refactoring
Fix error