Move comment to correct class