Minor swift improvements

[pixeldock]

Sorry to open another pull request so soon, but you merged my existing PR so fast that I couldn't include these small improvements ;-)

I went through the code and changed some small stuff that could be a bit swifitier.

Thanks a lot for porting this to Swift in the first place! Really helpful!