Fixed some style problems with return statements and formatted a few things - nothing new yet.