Remove unnecessary comments
Fix to properly check for undefined