improove commenting