STY: Add suggestions from @antgonza