Cleaning up some code.