Fix bugs
Refactoring