Make edits per reviews; fix spacing