Modifications suggested by Caitlin for my last PR