Making it a little less ugly