Improve inital commit