Make code more Swift-style
Merge pull request #1 from ataraxer/master

Make code more Swift-style