(TimS): Changes based on reviewers comments (and added readonly to unchanged member variable).