refactoring

2012-05-18, laurent