Refactor for java conventions, pour on the syntactic sugar.