Maybe this'll work

And a bit of coding consistency as well