general format improvements