Minor report refactoring