Modernizing code based on Xcode 5’s recommendations.