Small adjustments, added comment highligh scope