Add comments
Be consistent about values in lookup/comparisons