small reorganisation + typos