Removed unused methods. PEP-8 warnings fixed.