Changing conditional for better readabilty