#SB-132

Rolled up/cleaned up some code.