- Moved Subscriber back into Delegate
- Formatting