Fixed tags/spaces in some files