Cleanup the way we get the id from factory Kind
Merge pull request #53 from Zizaco/refactor-factory

Cleanup the way we get the id from factory Kind