Refactorized Class to Hash.Typo errors.