Removed unused code.
Fixing PEP-8 violations.