Update descriptions
Changed message for cleaner look
Update check method
Add .isOptional logic