Re-organized functions.php