WELD-1452 Minor code cleanup