Cleaning up some files. Small changes here