a little more Obstacle refactoring