Incorporate feedback from Sandro

This addresses #224.