CR changes: updated PHPDoc, simplified condition