Style tweaks. Also less time sleeping so faster tests.