Following new Moxie Representation naming scheme

Some additional PEP8 changes :shipit: