Report and refactoring update