remove more unnecessary variable usage