Clean up the source code here and there.