DF Added missing constants.
DF Some styling changes.
SC#QCADOOMES-1621 Refactored work plans.