Small changes based on code review