Some source code cleaning is added.