optimized Property loads and responded to Marco's comments