Some cleanup in the files