minor cleaning, and add a FIXME comment