Refactoring - decoupled utils functions to improve readability
Better doc and version++