mod: use refactored class to be simplified