re-factor chapters