Minor changes following personal code review