Fix bugs, refactoring
Refactoring