Refactor in preparation for landing report requests