Incorporated Kayvon's suggestions.