implemented suggestions from @bonzai