Addressed code review comments.

#64