Prettied up some things