- applied xcode suggested changes