Fixed some style problems with return statements and formatted a few thi...

...ngs - nothing new yet.