Agreed, it's messy and also hard to read, so I've updated it.  Oddly, this is what Eclipse auto-generated.