Minor improvements (comments, scopes)