Code refactoring
http://outils.prodinternet.com/mantis/view.php?id=4310