Clean up functions.php a bit.