Used could use a good cleanup