Clean up some of the code re. PEP8. Pull apart Q-Statements vs Q-Solicitations