- Bumping version compat
- Code clean up