Clean up the code.  Fix coding style.