Refactoring

PEP 8 Compliant
Removed unused variables and colons