Fixed minor pep8 issues
Refactored code for L3 and Infrastructure

Misc Fixes and cleanup.
Added code for service and host agent