cleaned things up a bit

Cleaned up to match up with PEP 8.