minor name changes and updated comments