refactoring

2012-05-21, laurent