Some slight refactoring for swiftiness

I thought you pushed up that change?