Refactor
Cleanup
Bumps versions