- CHG: selector fields to properties
- CHG: code cleanups