Minor Edits after flattening files