Nstonehouse/refactoring/log reporter