[Refactoring]: last polishing bit to some functions in order to be more complete.