Bug fixing
Refactoring