minor changes based on code review