Clean up property code; add struct version and rect of display example