Some minor cleaning up; Started on the actual matchmaking algorithm