Modify Factory Usage.
Fixed jsHint Errors.