Cleaned up some imports and made editing a team repaint