comments and reordering
remove dependency on temp files of test and remove throwing of IOException