Address @emersion's review comments
Address @emersion's review comments

ascent12/sway,1ace/sway,taiyu-len/sway,1ace/sway,1ace/sway,SirCmpwn/sway,taiyu-len/sway,ascent12/sway,ascent12/sway,taiyu-len/sway