removed unused methods. more PEP8 stuff