Simple changes after code review