formatted a few more