Code Cleanup

Hashing is in development.