Move variables to narrower scope and indent
1 file changed