more formatting, cleaning house