remove useless return
clean up spec's.

various style tweaks.  Some formatting, others with default hashes.