get rid of format, a bit of restructuring