Incorporate feedback from bbatsov