Changes suggested during PR review