Refactor: naming
Improve: error handling when creating instance with args