cleanup for Abstract Factory Example

cleanup for Abstract Factory Example