Refactoring

Ticket created - https://github.com/DemandCube/NeverwinterDP/issues/353