Fixed it up a bit more