Added whitespace matching and header level