Simplify, slightly reword or remove akiban from comments