Thanks - all good points to decrease verbosity, increase maintainability.