Minor edits to data access