Code cleanup + service isolation
PEP8ified