Addressed eilon's code review comments.

#64