Code refactoring and adding filtering by type. Skill and type are now options and should be used with -- :beer: