Work on formatting a little