some minor re-formattings