- Refactor, optimize create method