Some refactoring. Also added usage of wild cards to usage docs.