fixed it up a bit