Use only 6 digit shas
Improve formatting for v0.3