Cleaning up some of the messier changes