Making it pretty-er