Code cleanup for dealing with hash generation
Comments