Refactored formatting for Groovy goodness.

Almost exlcusively formatting changes to use Groovy's syntactic sugar.
No functionality changes.