Added join helper
Cleanup