minor refactoring for cleaner code
Authored by: thibautd 2013-02-08
Parent: [r22945]
Child: [r22947]