Changes related to code review

Code review at #2