source cleanup - addressing PR comments