Add comments + simplify some unrelated string literals