clean this mess up