Improve SHA in commits and consolidate a few styles