Code cleanup: useless inits removed in local variables