PEP-8 edits and trimming unused imports
somehow didn't pass the sorter from cube diff service to the sort part
changes for the categorization by your converted mana cost and associated tests