Partial continued refactoring of Statement Data