Clean this up a tich