Addressed feedbacks from #30. please review