Incorporate suggestions from @davegolland