Organised messy booleans into switch statements