Tidy up functions.php