property lookup cleanup and documentation