Style mods
Attempting to fix raw queries. Still work to do.