few variable declaration changes