Updated utils, including the Eclipse formatter