Closes #6339
- decomposed into set of separate components - reduced number of magic numbers - minor adjustments with design