formatting + clean up