Clean code and modularized

For Philly, NY, Chicago, On-Premise