Comment and refactor create and init