Add code review remarks and changes.
Merge pull request #2 from Beatris/master

Add code review remarks and changes.