remove useless temp variable + indenting fix