Tweaks to match raywenderlich.com Swift Style guide