Tried to follow PEP 8 better.