General refactoring
Utilities refactoring