Small updates/formating