Simplify Data methods and update a couple of comments