another quick cleanup