Minor refactor of init
Cleanup
Fixed git check