minor cleanup; moving toward world-space transform