Overhaul & PEP8