Address @trustins comments