Formating fixes