Cleanup

Blocks are your friend. They are more idiomatic than %Q.