Quick refactor

Merged Ian Foster requested to merge quick_refactor into develop

Merge request reports