Made SearchSpace slightly more OO