Some Cleanups for a few files