Minor cleanup and placing things on appropriate thread models