modular skeleto refactored
refactored