Various cleanup
Join first draft