Refactoring and bug fixes
Refactoring and bug fixes