Personally kinda dislike setting values to variables in conditionals - it's not good for code readability even if it makes the code shorter. But this is just an opinion, no need to change it unless someone agrees ;)

Otherwise :+1: - much cleaner! Would be happy to merge if some other dev gives a +1 too