Converted repetitive getData() calls into objects, where it made sense