I'll put in a seperate commit and PR to remove the else's in functions like these then