Code cleanup

1. Run the Eclipse formatter on new code.
2. Fix EOP spec so that EOP object is listed first.