Adressed review comments from #55.