Cleaned up PEP-8 (100 characters, not 79, because come on.)