Repo clean-up, minor comments