minor changes to include code review hints