Style Dev Update

Linked issue: #1978