Refactoring post pull request #4 merge.