Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Nathan Contino <41cdeb2c63ab765442483ee698b28de5c696cc8d@protonmail.com>
gradle/gradle,gradle/gradle,gradle/gradle,gradle/gradle,gradle/gradle,gradle/gradle,gradle/gradle,gradle/gradle,gradle/gradle,gradle/gradle