Moving more functions into functions.php include