Refactoring of some underlying code
Refactoring of some underlying code