deleted some spaces
refactored modular inclusion