Refactor/1531

Closes #1531