general structure modelling/cleanup