Comment and refactor persistence layer.