Cleaning this mess up some.