Some changes suggested by @cassiedoll and @AngieHinrichs