Testing generic data access (issue #20). Reformatted source code.