Cleaned up new hash code