Refactored and simplified code for includes/excludes