Cleaning up some code from last night.