Tidied up some ifs