Refactor entity instantiator and remove console.log