Standardize syntax

Make syntax conform to
https://github.com/raywenderlich/swift-style-guide
TESTED=Built app and used
Swift-ify a number of collection types

TESTED=Ran App
More Swift-ification.

TESTED=Ran App