some variables cleanup