Toying with which pattern to use to create skills/enchants, cleaned up all code a little bit