Changes related to @DavidBruant 's conrad review

The review is accessible here: https://gist.github.com/DavidBruant/7770810