- Added testable implementations + tests
- Formatted code