A few tweaks and cleanup