Cleaning up some. More to come.