Reanrange and fix typos