Formating and minor updates