Reorganisation
Changed formatting