some little changes (renaming, comments)