Mod: split dedicated methods in dedicated class
Add: cosmetic