Rewrite Inefficient Queries

Refactor queries to be more concise, avoid `SELECT *`, and use appropriate join types.