added some spacing, moved a few bits around