Addressed notes on github.