Fix it up a little bit