Major tidy up and update throughout