- Includes some refactoring
Objective-C to Swift conversion