Reformatting more of functions.php