removed some style cruft but lost some meaningful stuff too. Still converting.