Sanitize

Podhorszki, Norbertrequested to merge
github/fork/williamfgc/sanitize into master

Created by: williamfgc

This is an ongoing effort to sanitize piece of the code. It should be regular practice. Related to #1615

Merge request reports