made changes according to owens comments on github