further steps toward a better OO-stucture