Partial commit
Refactoring