rename one variable and inline another one.
fix indentation