No ticket. Simplifies data methods and updates comments. Closes gh-1233