Slimed down, made more PEP8 compliant.