fixed comments according to framework