Remove duplicating definitions, and PEP8-ing (\t -> 4 spaces, etc.)