A few tweaks, cleanup