no longer one-shot, formatting cleanup (eclipse)