Minor edits/cleanups in all the files..