Add comments, scope in private variables