remove old comment and cleanup variable naming