Complete Part 1: Simple Queries. Fix formatting