Cleaned up everything, got rid of storing matches