Fix issues with white spaces

As usual, small inconsistencies with PEP8 regarding usage of spaces and new
lines. I made relevant changes to keep pep8 checker happy.