Clean up from_hash method.
Replace overly-similar method names.