Fixing some representation bugs
Reformat & PEP-8