And a tiny bit more code cleanup. Not worth putting this on multiple lines