got rid of global variable
trimmed includes