Format cleanup