Made Andreea’s suggested changes on these files.