Finished EmotionalStateFactory and refactored set/getType