Cleaning up some source code.