Release commit
Refactoring