FIX: address minor comments