cleanup using formatting