get rid of coupled classes