Fixes regarding @emersion's feedback
Fixes regarding @emersion's feedback

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