Class 7: Database test - query builder / tidying up code / comments