format improvements