improve functions.php organization