another quick clean up