cleanup some trailing white space, rename some files