Code style changed. Factory removed.