Minor codechanges and -cleanings in functions.php