Spacing and a change to commons-io