First fully working version of the Infrastructure
refactoring for PEP-8 compatibility