Code cleanup
PEP8 complaince

I guess I'm all about snake case now or whatever