Several style fixes

Hi there!
Here's a bunch of small patches like extra white spaces, brackets, unused imports, etc. Hope they will be useful.