IMPULSE-12 Minor Cleanup.