Cleaned up imports and used a set instead of a list