Grae's Suggestions

Took on the suggestion of a tutor from Thinkfu.