small improvements (comments, unification of code, i to ii...)