comments, renames, minor refactor