Lot of nitpicks, arguably silly and useless, and it's maybe also be to do it prior or after moving the code.
I'm also fine with not doing any of the suggestions, but I think it's the opportunity to make the code a little bit more consistent.
Other than that the logic looks fine.