Cleanup - addressing PR comments