reformat includes/functions