moved comment to relevant area