Refactoring interfaces out of option
- Clean up the interfaces, removing Value and replacing with AnyVal