Fixed inclusion wildcard bug; refactored code for sense and efficiency