Clean this some more