clean up; fixed variable declaration locations.