Refactor memory model of type checker