Spruced up the Groovy a bit

No more semi-colons
No more public modifiers
Tests use Closures over handlers
Maps for config