Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: sighphyre <ac147e41ecc7493e450909a975d58205736c13ba@gmail.com>
Unleash/unleash,Unleash/unleash,Unleash/unleash,Unleash/unleash