Fix broken SHA1 sums

Other code cleanup