Clean code and a tiny optimization

Clean commented code and a tiny optimization to return false if the value is null.