#POULPE-503
Trivial changes in comments and code.