More whitespace cleanup
Make C* requests encoding performed by a worker