Code Review

Add comments