Refactroring, fixing exculde patterns