Some slight refactoring for swiftiness

Years of training, waiting for this moment...