Clean up CTF a bit