formatting, cleaning up