Refactoring
Fix bug