First commit: Addeed comments.