@emir-hasanbegovic refactored some code from the Creators to the CreatorHelper. Cleaned up imports and empty space