some slight cleanup