Cleaning up some of the changes I just made.