Proposed refactorings as well as initial commit for DRE-24 (logging/audit)