reformatting, cleaning up