Cleanup formatting and add hash.h