refactored use of variables as includes.