Added check for blank quote. Clean up source.