Implemented feedback from @chrisatsc and @jamierumbelow.