Some commenting and rearrange on the ttt coffee