Bug Fixes/Formatted to PEP 8