Adding comments
Improving spacing
new version modular