fix bulkify
add todo comment
Merge pull request #8 from yaplas/refactor/validations

Refactor/validations