Format the java code more nicely

Formats the code according to the age-old Sun Java
conventions, which most Java devs should find
easier to read.

This also removes the reliance on magic strings
in the execute() method.