unifying style and adding some git tweaks