Cleaned up card set form