Fixed line indentations in files and removed dependency on commons-io