Address @elemoine comments from #509

@elemoine comments were not addressed before #509 got merged.