cleanup, generalize variables