CS issues: please use ``null ===`` to check for null and please add the curly braces for the conditional structure