Clean some logic up.