MINOR:
- Light refactor, comments etc