Readability improvements:
   Fixed spacing
   Added comments
Fixed bug for display of property class name after selecting from modal window