#24 : working on Royalty report refactoring